-
Notifications
You must be signed in to change notification settings - Fork 95
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
SA .357 Custom Item Addition #193
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Co-authored-by: XSlayer300 <[email protected]>
Alright, that should fix all the issues. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel I misunderstand, what is the reasoning for the switch?
The swap is based on the fact that the Spearhead is shown to be the canonical revolver for the USCM, based on the game Aliens: Dark Descent. So I've just gone in and swapped the M44 from the vendors with a new Spearhead, as well as updating the CMB to look better. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Conflicts have been resolved. A maintainer will review the pull request shortly. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
morrow still gotta approve of adding it to loadout, but i think its fine personally
@@ -1232,13 +1232,15 @@ | |||
"icon_y" = -5)) | |||
|
|||
/obj/item/storage/belt/gun/m44 | |||
name = "\improper M276 pattern M44 holster rig" | |||
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is for the M44 magnum revolver, along with six small pouches for speedloaders. It smells faintly of hay." | |||
name = "\improper M276 pattern revolver pistol holster rig" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be just "M276 pattern revolver holster rig"
new /obj/item/ammo_magazine/revolver/marksman(src) | ||
new /obj/item/ammo_magazine/revolver/marksman(src) | ||
new /obj/item/ammo_magazine/revolver/marksman(src) | ||
new /obj/item/ammo_magazine/revolver/marksman(src) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that's a lot of non-standard ammo for apparently no reason, and also a flashlight? dont think thats necessary
new /obj/item/ammo_magazine/revolver/cmb/normalpoint(src) | ||
new /obj/item/ammo_magazine/revolver/cmb/normalpoint(src) | ||
new /obj/item/ammo_magazine/revolver/cmb/normalpoint(src) | ||
new /obj/item/ammo_magazine/revolver/cmb/normalpoint(src) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dont think custom revolver needs that many speedloaders and a flashlight, make it 2 just like with 1911
besides, you can still scavenge ammo from CMBs and security groundside, i think that would be interesting
@@ -347,6 +347,9 @@ | |||
icon_state = "m44rc" | |||
item_state = "m44rc" | |||
|
|||
/obj/item/weapon/gun/revolver/m44/custom/mp //loadout w/ ammo | |||
current_mag = /obj/item/ammo_magazine/internal/revolver/m44/marksman |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dont think loadout equipment should have buffs.....
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
stale for more than a month, author seems to be inactive |
Adds a new loadout option in gear preferences for the SA .357 Spearhead. Provides a guncase with ammunition for it, with potential for the player to scavenge more ammunition in the field from the standard CMB Spearhead. Also changes the custom M44 to come in a gun case with marksman ammunition and adjusts pistol belts to include the new addition..